You don't need to remove the headliner to remove the glass. Here is is outlined in the service manual:
1. Open the sunshade.
2. Tilt up the glass.
3. Remove the bolts (6 on the brackets holding the glass down) and then remove the glass from the glass bracket.
4. Remove the screw and lift the sunshade rail on each side.
5. Slide the sunshade forward and then remove the sunshade. (There are two screws holding the sunshade brackets on.
6. Installation is the reverse of removal procedure.
7. Check for water leaks.
You may also want to check the motor for any loose connections to the glass but that would require the complete removal of the headliner to check.
Let me know if you need anything more because I have the service manual handy to help anyone out.