P880:Init cleanup from derp&no-op

Change-Id: Iaa29a9a1bd33e84045e1a229f307d8439053efa2