Doing some cleaning  by simonp
_