remove old code, don't double-request, and clean up table refresh