removed all other define calls