cleaning up the madness

Change-Id: I2f69bf8b7fea41a7ac667b045b220b76a00e628d