move some code to be able to import it correctly without triggering old and unused/untested code.