Finished cleanup

Now Alec needs to verify it all