Clean up

Change-Id: Ic60a9816c75a0357cd0f7d0b53bd72fea5a5041b