Also removed two lines of code for feature flags that no longer exist in the codebase
Attach a file by drag & drop or click to upload
