All the functionality removed has already made it into the client repo Change-Id: Icc4748100d06d0bac08619d7fe17c924b81a106f