Remove unused files. Fix some style offenses.