first commit after a Spring cleanup