Removing remaining spam clearing code