Removing Constants class.