diff --git a/app/sim_test.go b/app/sim_test.go
index 9ca6fd0..a7a3a72 100644
--- a/app/sim_test.go
+++ b/app/sim_test.go
@@ -78,8 +78,6 @@ func interBlockCacheOpt() func(*baseapp.BaseApp) {
 	return baseapp.SetInterBlockCache(store.NewCommitKVStoreCacheManager())
 }
 
-// // TODO: Make another test for the fuzzer itself, which just has noOp txs
-// // and doesn't depend on the application.
 func TestAppStateDeterminism(t *testing.T) {
 	if !simapp.FlagEnabledValue {
 		t.Skip("skipping application simulation")
diff --git a/x/feeabs/keeper/abci.go b/x/feeabs/keeper/abci.go
index 0de36b3..1a1b344 100644
--- a/x/feeabs/keeper/abci.go
+++ b/x/feeabs/keeper/abci.go
@@ -29,7 +29,6 @@ func (k Keeper) BeginBlocker(ctx sdk.Context) {
 			return false
 		}
 		epochInfo.CurrentEpochStartHeight = ctx.BlockHeight()
-		// TODO: need create function to this
 
 		if shouldInitialEpochStart {
 			epochInfo.EpochCountingStarted = true
diff --git a/x/feeabs/keeper/config.go b/x/feeabs/keeper/config.go
index 091ab0e..1cec729 100644
--- a/x/feeabs/keeper/config.go
+++ b/x/feeabs/keeper/config.go
@@ -94,7 +94,6 @@ func (keeper Keeper) FrozenHostZoneByIBCDenom(ctx sdk.Context, ibcDenom string)
 func (keeper Keeper) UnFrozenHostZoneByIBCDenom(ctx sdk.Context, ibcDenom string) error {
 	hostChainConfig, err := keeper.GetHostZoneConfig(ctx, ibcDenom)
 	if err != nil {
-		// TODO: registry the error here
 		return sdkerrors.Wrapf(types.ErrHostZoneConfigNotFound, err.Error())
 	}
 	hostChainConfig.Frozen = false
diff --git a/x/feeabs/keeper/ibc.go b/x/feeabs/keeper/ibc.go
index c0894ef..b5b1c62 100644
--- a/x/feeabs/keeper/ibc.go
+++ b/x/feeabs/keeper/ibc.go
@@ -248,8 +248,7 @@ func (k Keeper) transferOsmosisCrosschainSwap(ctx sdk.Context, hostChainConfig t
 	nativeDenomIBCedInOsmosis := params.NativeIbcedInOsmosis
 	chainName := params.ChainName
 
-	// TODO: don't use it in product version.
-	if sdk.NewInt(1).GTE(token.Amount) {
+	if !token.Amount.IsPositive() {
 		return nil
 	}
 
diff --git a/x/feeabs/module.go b/x/feeabs/module.go
index 4ce3f30..a3459b8 100644
--- a/x/feeabs/module.go
+++ b/x/feeabs/module.go
@@ -80,7 +80,6 @@ func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, serveM
 }
 
 // GetTxCmd returns the feeabs module's root tx command.
-// TODO: need to implement
 func (a AppModuleBasic) GetTxCmd() *cobra.Command {
 	return cli.NewTxCmd()
 }
@@ -159,14 +158,12 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 }
 
 // BeginBlock returns the begin blocker for the feeabs module.
-// TODO: implement if needed
 func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
 	am.keeper.BeginBlocker(ctx)
 }
 
 // EndBlock returns the end blocker for the feeabs module. It returns no validator
 // updates.
-// TODO: implement if needed
 func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate {
 	return []abci.ValidatorUpdate{}
 }