Vendor: Remove legacy props for now