remove some unused
tweaked..