Remove Server from Search Application

I did a major **it! mistake. One of my WFE server was showing up with the IP address as the name. I thought ok no problem so I went ahead and created the Search Application. Found out it was causing some problems so I decided to remove it from the farm and re add it. Found out it's a big no no.

Can someone point me to the correct procedure to remove the query component with the IP address as the name. I realize I have ServerID mismatch and try to resolve it by trying to remove it but could not because the query topology is no in active state.  Query comp 1 is in offline and Query comp 2 is in IndexSplitDone. 

I figure if I put the Query topology in an inactive then I can remove query comp 1. Can't figure this step out. Im thinking I might have to call MS for support.

Please share wisdom.