Removing remenants of old code from previous design.

Also, did a run through of PEP8 standards on a portion of
touched files for a mid-task coding standards cleanup.