Remove old Bundle generator code