cleanup, removing unused stuff'