editor: refactoring - remove old unnecessary markup