remove some stuff - put in experimental branch