Removing unused func and imports