Remove through2 dependency