Removed templates to further simplify.