CS cleanup and composer updates