Removed useless imports and name clashes