Modified the profiles to use one call to cleanup_value instead of three.