Removed unused old code