Cleaning up swps