Makde a start in removing PropertyGroup