fixing cleanup, commenting broken removals