Clean up alma presave function and profile2 value handling