CS cleanups