Clean up and Removed type on Gender and Number Label