Removed references to Motivator in most places, starting real motive resolution