remove many bugs