Changes for removing additional imports etc.