general: removed now orphaned defines, refs #622