Merge pull request #427 from y-higuchi/light_code_cleanup

Fix unused import warnings