revert previous clean up