Remove technical debt