more refactoring: header controllet not needed