Oops, cleaning up references