Fix up more cerrs. Remove more useless files