get rid off outdated code segments - wip