Clean Up

This is untested.

The last few calls to github, are ones that weren't obvious to me. And I wanted to review with you first.

See you Monday.

-d