removed unused import
removed spring xml configurations, moved to javaConfig. Upgraded spring from 3 to 4x, + cleanup