Cleanup remove python

Removed a bunch of the old commented-out python code left over from when we ported to groovy. Also cleaned up some things, added explicit types, and what not.