Squash more technical debt