refactoring. Remove a lot of code rom Beans (former controllers)