Remove never used template code (2)