removing a lot unused stuff