Tidying the solution, removing unused classes and files