Cleanup

Change-Id: Iadc1a8788f96d7898609f1b64c4a4179d09f39ce
Revert "Cleanup"

This reverts commit de3140f1b43b320c138d67959d6b902ce939759a.