removing BETWEEN macro