tidy up, removing unused stuff