Remove more direct access checks