removed unused code
wip