Cleaning up that technical debt