Code clean up after PR e86546c