Cleaned up obsolete code, pepified files.