remove some experimental stuff in prep for next release