cleanup specs and namespacing