Remove unused code + Remove support under 1.6