Forgot to remove references to classes that no longer exist