Merge "Removed dead code" into main