remove some experimental stuff, no in experimental branch