Fix for CnrD parser error, removed unused stuff.
Cleaned up the interface a whole lot.