Merge "Remove unused classes" into main