Clean up unused function interfaces

See title