Cleanup code for use with jedi 0.8.0