lot more cleanup and file I forgot to push