Cleanup defense a bit