Cleanup: removed Xperia specifics