fixed escaping in remove methods