Removing cond and do to make curriculum smaller