unused legacy code removed