Candidates: shea-porter fixes
Remove unused files