Cleaning up some things for a release without all the fancy features