Cleanups

Change-Id: If2b56feab3093a65ff6465f34a93d4358f8ed7d4