Purged some obsolete files pulled in from github merge