Fix compilation and minor clean-ups

There were some files that shouldn't be checked in, so I deleted them.
I also fixed the solution so it would compile.