Update Registration type import, clean up feature.