Private qt4

various clean-ups, include removals...