removed some cruft, template cache stuff