Cleanup in rc.map