Fix spec and clean some spec files