Remove mcmahon specific code