Merge "Remove unused services code" into main