More code cleanup before I refactor and build