Remove this semi-global function....