cleanup before refactor