move Create*Client in places where it actually makes sense and fix a TODO for non omtc gl