Bring back some of the cleaned out stuff from last commit