Removed templated stuff.