Removed on_hand call, and commented out use_s3 check as both are wrong