Cleanup for agoettler, he is new to Github.