Removed 1.6 compatibility code