Remove extraneous 'then's