NOJIRA: Remove temporary comments