removed unused stuff, todos