remove 1.6 specific function