otw - Removing a few temporary changes from earlier testing.