remove direct property access from two spots