fix CS and remove dead code