Clean Up

Converted all remaining tabs to spaces and deleted the extraneous source
that is no longer being used