More cleanup for Lollipop