Maven, remove lockette dependency, and 1.8 build
Refactor for maven