Toyota Repair: 1999 Sienna intermittantly wont start, auto parts store, box assembly

Question
My 1999 Sienna occaisionally won't start.  It will just make a loud "click" sound.  Battery is good.  My local auto parts store said it is either the starter or the starter switch, and said if I can bring in the starter they will test it.  How do I remove the starter?  It looks like it is right on top, so it shouldn't be too hard.  Does it sound like the starter to you?  I have read on the internet that some people say it is the contacts on the starter and I should just replace those and not the whole starter.  HELP!

Answer
yea, the starter contacts are corroded.  it is not hard to get out.  remove the battery and the air cleaner box assembly.  its held onto the transmission housing with 2 14mm bolts.  the contacts are located inside the solenoid case on the side of the starter.  just r&r the little cover, held on with 2 8mm bolts and you'll see the contacts inside.....