erased unnecessary logic