get rid of non-required old-style prefix-related lines of code