Revert back and cleanup