Clean unused code in swap 2