removed unused stuff (partially)