Resolve F401 - module imported but unused

Change-Id: I33eedbb7b2df0b5ebf99f680f900759e3521f54e