diff --git a/.eslintrc.yml b/.eslintrc.yml
index 102c85d..95867e4 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -11,3 +11,4 @@ plugins:
   - prettier
 rules:
   'prettier/prettier': warn
+  '@next/next/no-img-element': off
diff --git a/components/ClaimModal/ClaimModal.tsx b/components/ClaimModal/ClaimModal.tsx
index 926f089..7214fe6 100644
--- a/components/ClaimModal/ClaimModal.tsx
+++ b/components/ClaimModal/ClaimModal.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @next/next/no-img-element */
-// TODO trkaplan disable no-img-element in eslint config
 import { FC, useState } from 'react';
 import Modal from 'react-modal';
 
diff --git a/components/ConnectButton/ConnectButton.tsx b/components/ConnectButton/ConnectButton.tsx
index 94e5af6..a696b00 100644
--- a/components/ConnectButton/ConnectButton.tsx
+++ b/components/ConnectButton/ConnectButton.tsx
@@ -8,11 +8,8 @@ interface ConnectButtonProps {
   text?: string;
 }
 
-export const ConnectButton: FC<ConnectButtonProps> = ({ enabled, onClick, address }) => {
-  // TODO trkaplan disable if wallet is not installed
-  return (
-    <button disabled={!enabled} onClick={onClick} className="text-button">
-      {address ? shortenWalletAddress(address) : 'Connect'}
-    </button>
-  );
-};
+export const ConnectButton: FC<ConnectButtonProps> = ({ enabled, onClick, address }) => (
+  <button disabled={!enabled} onClick={onClick} className="text-button">
+    {address ? shortenWalletAddress(address) : 'Connect'}
+  </button>
+);
diff --git a/components/MintedNftsView/MintedNftsView.tsx b/components/MintedNftsView/MintedNftsView.tsx
index 380c525..b6776ff 100644
--- a/components/MintedNftsView/MintedNftsView.tsx
+++ b/components/MintedNftsView/MintedNftsView.tsx
@@ -12,7 +12,6 @@ export const MintedNftsView: FC<MintedNftsViewProps> = ({ navigateToHome, number
     <br />
     <div className="mintedNftImagesWrapper">
       {[...Array(numberOfNfts)].map((value: undefined, index: number) => (
-        // eslint-disable-next-line @next/next/no-img-element
         <img className="mintedNftImage" alt="Parcel 0 NFT Art" key={index} src="/citydao-parcel-0-NFT-Art-sm2.png" />
       ))}
     </div>
diff --git a/pages/index.tsx b/pages/index.tsx
index 3e75116..06e865e 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @next/next/no-img-element */
 import { ethers } from 'ethers';
 import keccak256 from 'keccak256';
 import MerkleTree from 'merkletreejs';