Mavenize and remove lockette support