allow dead_code + clean comments