Added remove method in editor
Merge branch 'develop'