Clean up authorizations
Fix specs