Remove unnecessary initializers. Remove caching bug fixes that are no longer relevant.