Updated code to remove unwanted imports