removed some unnecessary items