Additionally, replace one (or (org-mode-p) (derived-mode-p 'org-mode)) with (derived-mode-p 'org-mode) cause that is reflexive anyway (returns true, if the current mode is org-mode). Delete one check testing for org-mode or org derived mode