Removing more redundant imports