todo
clean up legacy id/class divs