More cleanup & API 15 Compatibility.