#3124 clean up