remove overuse of define