20141201 - Cleaning up Ron's mess