#3411 code clean up