Clean up interface API