cotinue deleting unused stuff, some fixes