Merge "Remove unused old UI code" into klp-dev