Cleanup pom.xml and spectating related classes