removed more swap files and modified Closure