remove old code
improve output and remove first iteration in calculation velocity estimation
add definition for functor order