Repository Cleanup

Some random changes.