20141126 - Cleaning up Ron's mess