more cleanup, removed unused stuff