Beans removed from xml and controller annotation added