remove the rest of the controversial stuff