Merge "Remove redundant code after merging into flexiglass" into main