removed cs route and tests, and cleaned up a bit.