turned on caching; remove unneeded code