spec cleanup for newer config