removed some surplus stuff