20141202 - Cleaning up Ron's mess