[IMP] Remove import and search custom picking type