Removed old non template code