remove some awkwards