rm secret token
bugfix; DRYs many models; job type separation