removed unused old code