Clean up CS