Simplify completion configuration