removed some unnecessary features