2nd changes

remove unused vars; add more FIXME