Cleaned up raptor-editor mess.