- deprecate/remove redundant factory implementations Change-Id: I29ba9f3397c37c02b37d07dff16a4203186c5fcd