simplify/cleanup previous commit