Removed commented templates