Remove remaining genplate references