Maliv2 Clean some junk and useless defines and checks.