removed branch and edited/cleaned spec files