Got rid of useless imports/variables