Clean-up and updates

Change-Id: I7b33a43027e2ecae6ae2d44a2cbb31afcf48321f