get rid of ipdb & clean up