Cleanly remove editors/builders and keep track of editor order