Remove references to classes I removed in the clean up