misc fixes; remove dead code