Some post 4.4 cleanup

Change-Id: I8e9f1d9a6f645feaaf585c0cc3872af8b06a5b98