enabled clean up

closer to a testable script