REmoving broken functionality