get rid of the push pull stuff