More legacy code removed