Allow for properties to be removed (#2113) * Allow for properties to be removed * Added validation checks