Cleanup

Lots of renames and deletions.