cleanup, move to Spring Data release train Codd