Remove usage of obsolete defines