Clean up constant check