Removed unused code that breaks certain use cases