Not everything requires integration Clean up the code that is being moved Change-Id: I045641a8b72fa07f21f3a41d84bb24aca55374a0