Cleaning: remove RH5 specific code