Cleaning up unstable code