Remove old proxy code