removed some unused stuff