Cleaning up rushed technical debt