Merge "Fix warnings and remove dead code"