[Alt-F2] Cleanup