1. pom cleanup
2. added housekeeping for old keys
3. refactoring