removed postpone and repeat fields