Merge "Revert "Add cleanspec""