remove define statements, for now