kill EnhancedQuit and other dead code