remove more guards