Misc final fixes

* Remove missed things
* Fix PEP8 errors