cleaning up some files
And more cleaning up of deleted files