remove some experemental code