Merge "Remove unneeded code" into main