WIP various details cleanup old stuff