removed buggy units