Remove unstable code from master