Cleaning up some experimental stuff