Simplified swap
Cleaning