CON-142: Remove old hubs code