Final cleanup of old editor prototype