Remove introduced bugs