try some cleanups after revert