More cleanup
Nexus 5 compatibility