remove old dead code 2