Cleanup code completion engines
Some changes