CHANGE: redundant remove clauses