API|Map: Cleanup