Cleanup of interfaces