Cleanup of spamtrap since I've merged it into my other plugin