removed some stuff no longer necessary