cleanup/better fit to Spring Security 3.2