Start to cleanup the fsc tutorial