Cleanup some leftover $j usages

Change-Id: I291d3978c8bc6535294fb865ec77404a4dbc38dc