Remove swap file and remove useless lines