cleanup solution and project file a bit