Clean up singleton specs