Cleanup and add sonatype requirement for maven central