remove 1.8 compatibility