Cleanup from Larry Doolittle