Remove use of Constant class.