Remove additional commas
Relaxed type checking in findUser and findClient