More job edit cleanup