Removed unnecessary search fields