Removed redundant defines. Issue #1158