Merge "Remove technical debt"