Don't go removing non-optional references