More Cleanup for #7