random fixes before mock 3
removed swap files