adds missing specs and removes unused code