Updates to classroom cleanup and field collection to content type.