get rid of the push/pop dir crap