Removing unused parts of proxying code