Adding stale to local data cache, cleaning up objects and adding
comments