Remove direct access checks