Removing old proxy code