Removed part of the caller reference code, and this needs to be fixed
later. It's not important right now, though.