removed unnecessary features