Removing unneeded imports and replacing * import