Removing NO_SWAP option and related code as we never want to use that. A few other minor cleanups too.