Removed leftovers for labeled
Remove some comments and add uniqueness of typing