Optimize related to when using --no-personal