squash: removed unnecessary defines
squash: substituted defines