Clean up code; remove util scripts, put all in one python file.