Obsolete BMI hack removed