removed some tripe
reorg and kill dead code