Merge pull request from easylogic/feat/remove-unused-style remove unused styles