You shouldn't need this line anymore at all (or at least not most of it)