removing unused stuff2