More changes removing the ~files