Extend and adjust, don't replicate.
Remove useless imports