Revert + cleanup