Merge "remove incorrect initialization"