more clean-ups, make libtool reinstalled after gcc merge