diff --git a/packages/api-database/source/models/block.ts b/packages/api-database/source/models/block.ts
index 167ee5d9c..ec243a4b1 100644
--- a/packages/api-database/source/models/block.ts
+++ b/packages/api-database/source/models/block.ts
@@ -10,8 +10,6 @@ export class Block {
 	@Column({
 		primary: true,
 		type: "varchar",
-		// TODO: length depends on hash size...
-		// length: 64,
 	})
 	public readonly id!: string;
 
@@ -28,8 +26,6 @@ export class Block {
 
 	@Column({
 		type: "varchar",
-		// TODO: length depends on hash size...
-		// length: 64,
 	})
 	public readonly previousBlock!: string;
 
@@ -72,24 +68,18 @@ export class Block {
 	@Column({
 		nullable: false,
 		type: "varchar",
-		// TODO: length depends on hash size...
-		// length: 64,
 	})
 	public readonly payloadHash!: string;
 
 	@Column({
 		nullable: false,
 		type: "varchar",
-		// TODO: length depends on public key size...
-		// length: 66,
 	})
 	public readonly generatorPublicKey!: string;
 
 	@Column({
 		nullable: false,
 		type: "varchar",
-		// TODO: length depends on signature size...
-		// length: 256,
 	})
 	public readonly signature!: string;
 }
diff --git a/packages/api-database/source/models/mempool-transaction.ts b/packages/api-database/source/models/mempool-transaction.ts
index 9cd3ae09f..c87c63eaa 100644
--- a/packages/api-database/source/models/mempool-transaction.ts
+++ b/packages/api-database/source/models/mempool-transaction.ts
@@ -9,8 +9,6 @@ export class MempoolTransaction {
 	@Column({
 		primary: true,
 		type: "varchar",
-		// TODO: length depends on hash size...
-		// length: 64,
 	})
 	public id!: string;
 
@@ -42,8 +40,6 @@ export class MempoolTransaction {
 	@Column({
 		nullable: false,
 		type: "varchar",
-		// TODO: length depends on public key size...
-		// length: 66,
 	})
 	public senderPublicKey!: string;
 
@@ -85,8 +81,6 @@ export class MempoolTransaction {
 	@Column({
 		nullable: false,
 		type: "varchar",
-		// TODO: length depends on signature size...
-		// length: 256,
 	})
 	public readonly signature!: string;
 }
diff --git a/packages/api-database/source/models/transaction.ts b/packages/api-database/source/models/transaction.ts
index 91c43ece8..1530f9041 100644
--- a/packages/api-database/source/models/transaction.ts
+++ b/packages/api-database/source/models/transaction.ts
@@ -9,8 +9,6 @@ export class Transaction {
 	@Column({
 		primary: true,
 		type: "varchar",
-		// TODO: length depends on hash size...
-		// length: 64,
 	})
 	public id!: string;
 
@@ -36,8 +34,6 @@ export class Transaction {
 	@Column({
 		nullable: false,
 		type: "varchar",
-		// TODO: length depends on hash size..., also consider only storing height to save size since hash can be retrieved via join
-		// length: 64,
 	})
 	public blockId!: string;
 
@@ -68,8 +64,6 @@ export class Transaction {
 	@Column({
 		nullable: false,
 		type: "varchar",
-		// TODO: length depends on public key size...
-		// length: 66,
 	})
 	public senderPublicKey!: string;
 
@@ -111,8 +105,6 @@ export class Transaction {
 	@Column({
 		nullable: false,
 		type: "varchar",
-		// TODO: length depends on signature size...
-		// length: 256,
 	})
 	public readonly signature!: string;
 }
diff --git a/packages/api-database/source/models/wallet.ts b/packages/api-database/source/models/wallet.ts
index 4034701ed..3ca41a576 100644
--- a/packages/api-database/source/models/wallet.ts
+++ b/packages/api-database/source/models/wallet.ts
@@ -8,8 +8,6 @@ export class Wallet {
 	@Column({
 		primary: true,
 		type: "varchar",
-		// TODO: length depends on address size...
-		// length: 64,
 	})
 	public address!: string;
 
@@ -18,8 +16,6 @@ export class Wallet {
 		nullable: true,
 		type: "varchar",
 		unique: true,
-		// TODO: length depends on public key size...
-		// length: 66,
 	})
 	public publicKey!: string | undefined;
 
diff --git a/packages/api-http/source/controllers/node.ts b/packages/api-http/source/controllers/node.ts
index 503f1e03e..9b39a6204 100644
--- a/packages/api-http/source/controllers/node.ts
+++ b/packages/api-http/source/controllers/node.ts
@@ -29,14 +29,14 @@ export class NodeController extends Controller {
 
 	public async status(request: Hapi.Request) {
 		const state = await this.getState();
+		const medianPeerHeight = await this.peerRepositoryFactory().getMedianPeerHeight();
+		const ownHeight = Number(state?.height ?? 0);
 
 		return {
 			data: {
-				blocksCount: state ? (await this.peerRepositoryFactory().getMedianPeerHeight()) - +state.height : 0,
-				now: Number(state?.height ?? 0),
-				// TODO: add flag
-				synced: false,
-
+				blocksCount: state ? medianPeerHeight - ownHeight : 0,
+				now: ownHeight,
+				synced: ownHeight >= medianPeerHeight,
 				timestamp: dayjs().unix(),
 			},
 		};
@@ -44,14 +44,15 @@ export class NodeController extends Controller {
 
 	public async syncing(request: Hapi.Request) {
 		const state = await this.getState();
+		const medianPeerHeight = await this.peerRepositoryFactory().getMedianPeerHeight();
+		const ownHeight = Number(state?.height ?? 0);
 
 		return {
 			data: {
-				blocks: state ? (await this.peerRepositoryFactory().getMedianPeerHeight()) - +state.height : 0,
-				height: Number(state?.height ?? 0),
+				blocks: state ? medianPeerHeight - ownHeight : 0,
+				height: ownHeight,
 				id: state?.id ?? 0,
-				// TODO: add flag
-				syncing: false,
+				syncing: ownHeight < medianPeerHeight,
 			},
 		};
 	}