Everything migrated to NSIndexPath(s)
Remove unnecessary instance variables