Lifecycle cleanup

also address wakelock handling