Make some small changes and delete an unused file