Clean up spec files
Continue cleanup