removed some stuff we don't use