Remove unused import
Remove newly redundant functions from the API