Cleaned up for Maguro

Change-Id: Ic740f90c0c250e4d6082cf4bad9d413d3db36a69