[WIP COMMIT] Remove PropertyBag