another round of removing defines!