Use java 1.7
Repo cleanup