Deleted some unnecessary features