Removed unused spring-context.xml
Added SuppressWithNearbyCommentFilter to checkstyle.xml