removes mentions of withXXX and mapXXX