More cleanup, remove unnecessary code.
Port intlists from Java, need for flow graph.