Unnecessary import removal and headers constant rearrangement