Fixed #8
Get ride of duplicated imports