old file cleanup
file cleanup, runtests fix