removed some unused / non-working stuff