remove duplicate backwardcompat imports and excess logic