Additional cleanup and adding lots of files we may or may not need