Remove typedef and using