I know this is an old thread, but I wanted to thank the OP for it, took me all of 15 minutes to swap and its so worth it.
My wife was at the dealer for a service and she asked how much to remove it and they quoted her over $700!! I am wondering if they were quoting her to remove the wiring and everything completely because if they were going to charge that much to do this job they are high.