More cleanup, refactoring on software vs reference files for tomorrow