Move to Coffee and Compass, and massive cleanup