Revert and clean