Clean up some common properties prior to porting into a persistence store