removed some defunct defines