Clean up some things, fix up pom, and comment out unused methods