wip - initial code preparation
removed unused code