remove dead code, small updated