Remove remaining [] usage