Cleanup and build improvements

@elingg PTAL
Let's make this "mvn clean package" as it was before so the mvn repo is cleaned before building. "mvn clean package" should be the first line in the build script which will make building only one command. No reason I can see to split it out.