Minor code cleaning - off with textures, off with joystick controller