removed some things that don't seem to be needed anymore