removed unused legacy code