Update specs and remove broken