Removed more objectionable things