Remove refs to no longer loaded classes