[build] Remove some duplicates from our build