Unused spec removed.
Parallel spec and fixes.