and a few more files cleaned up