Merge "remove dead code"