Removed unnecessary features