Remove extra styles in v21/ and update `lint.xml`

Remove extra styles in v21/ and update `lint.xml`

fix #546