Cleanup and map integration