Cleanup of experimental stuff