Cleanup

Change-Id: I9185c090bc8285ccca5ab915300b634a08be8d41