Removed the unnecessary "DEFAULT_" constants.