Some cleanup in exploits