Moved some spam control functionality to SpamControl