More removed files and lines in an attempt to clear as much stuff as I
can