Remove unused files and change startup