fix up some places where frames are not free'd and remove an unnecessary