removed some other unused stuff