Merge "Fix unused vars/pointless assignments"