Cleanup in CommonProxy