bring order, remove legacy code