clean-up old code wip