Remove start stop variables, we don't need it