Add new specs and remove unused code