interim... cleanups.
cleanup
function orde attr no longer needed.