Removing some j$ references for consistency