Håvard M. Ottestad

Revert "clean up"

This reverts commit a6066920.
:)
\ No newline at end of file