removed y60 specific stuff