Cleanups, this should be it for rev2