Remove extraneous properties, update comments