Models CS cleanup