Cleanup some things and set baseline before major transformation logic refactor Part 2 of baseline cleanup