cleaning up the madness

Change-Id: Ic934c81e6f5c6cfcc8cb6dbdfa85c25e812648c5