removed old backward-compatibility macro
fixed small mistake regarding backward-compatibility macros