Clean up constants