Clean up of CS 1 and 2