Removed template stuff