20141109 - Cleaning up Ron's mess