Remove unstable code