Remove deploy_user_name and refactor related code