Add C colution, clean up a bit old solutions