Code cleaning by removing compatibility code