- fix JavaConfig to follow last changes
- remove annotated classes