Drop redundant imports and definitions