manta: cleanup

Change-Id: I610982a636a2398e56fb91f65e078833f642b205