integration wip: removing unused code