remove redundant function and switch back to using Imports