#15 Removing duplicated entries in imports