Removed unused code paths