First of many clean up items