cleaned up references again ...