xda-one: some minor cleanups