Removed old configuration
Added annotations on controllers