Edit behavior should open on the selected type 
Remove unused code, Fix edit behavior