Cleanup

Change-Id: Ifb5e50fc84e71064332383dce831c2511904ed1b