Further cleanup of default spec