Various fixes
removing backup files