More files clean up, 4 files still have a lot of errors