removed some stuff that is not needed anymore