cleanup code a bit. remove unused choice calculation in order code.