Merge "Remove critical code smells Bean classes"