simplify and remove some legacy stuff