simpliefied stuff
removed jobs