Remove Description fields and add use namespace statements