removed compatibility code with older versions
10 files changed