Remove buggy and ineffective flyweight optimization