And some more cleanup.
1 file changed