Clean up some of the YC classes