Clean up and prepare for second go at this.