Removed "exit hacks"