Removed stuff that crept back in from github migration.