xda-one: multiple cleanups and generic fixes