tidying up, removing unused stuff.