remove some YAGNI tidy up specs