I agree with you. I liked this episode although I wasn't completely sure why when it ended because I had yet to fully grasp all the different threads that it set up. The only thing that felt unnecessary to me was Adam coming back as a literal phantom.