Remove monkey patches that caused some error