Clean up again

- LasseKaa forgot to save, his changes should now be committed through
this one