Cleanup xbox

for review