Removed all Id references