Clean up 2

The first commit did not catch almost anything :(