more cleanup for excitebike (master)