Cleanup patch from larry doolittle