Remove unused old code, add w/s for PEP8.