NOJIRA: Remove temporary comments

(See PAHMA_1009)