remove legacy xml import code, fixed cleanup command to not use deprecated function