editor - remove unneeded map
binder - test few edge cases