More reference objects cleanups