Remove unused files and bring in the formatter