removed some stuff that was not implemented