Housekeeping, final part

Change-Id: Ife0d6af29a12ed707bd01c2689a5f1fb89d2de98