Nuked old data primitives, made some changes to validators.