remove more unused BS