Cleanup

Change-Id: Ie6c6153db5de773e3a6d31295207de8351a001db