Cleaning up non-claymus stuff.