(Salamander) Clean up Wii/Xbox implementations too