Introduce simpler timer - pull it up to layout
Remove unused _initOrder export
Remove unused argument from rank invocation
Some simplification to the order module