Remove legacy ENV accessor hack