Update spec file and cleanup