Remove old Promotion Conditions (now use the generic conditions engine) and some fixes