remove some stuff unneeded