Cleanup old defines