Remove sever toxic and fix no trailers and bugs #397

Closed xiaoyan-wang0 closed 2 years ago