Some post 4.4 cleanup

Change-Id: Iff5c9546751390a9c44bdb80b94eb78a12c503e8