MS-514 removing unneeded properties