Swap Update + cleanup commented code