Cleaning up unused things in preparation for a rework