CS cleanup