Cleanup 6.1.2

Updated poms, added required repos and removed auto-generated classes and configurations.