Remove unneeded imports and annotations
Remove dead code