Did some additional cleaning.
/Mikael Lindholm