cleanup ABS remains from merge