PEP8 compliance
New style classes
Unused stuff
Cleanup
Merge branch 'cleanup'