Profiling + rm pointless var assignment

Change-Id: I626aff5ee9094a7b849aadf59efbf46ee30c2825