And remove from setup

Change-Id: I9083d3ba77bac057b8b6941c596b2133c1f3ffad