cleanup specs and silence warnings