Cleaned up what we removed and some of the general code.