Cleaned up some stuff...

Change-Id: I3c9d7e14fcb6cb036e80920812c44f10185ab7d9