cleanup specs further