removed carleton only stuff and set cache time back to 6 hours