cleanup

I didn't do any changes related to spring-security-core 2.0, just general cleanup