Maintenance: removed duplicate function, moved editor functions.