removed flag pushing thing