Start of cleaning constant values code.