init: Cleanup & Lollipop fixes