added windao and rdp, cleanup some old stuff