Clean up a few defines