Various fixes and removal of odd entries.

Fixing various bugs with retrieved code and removing artifacts generated
by Github.