Cleanup, some preparation for standalone editor page.