diff --git a/node/DataConnection.ts b/node/DataConnection.ts
index 00c7baf..3b4937c 100644
--- a/node/DataConnection.ts
+++ b/node/DataConnection.ts
@@ -7,23 +7,7 @@ import * as _ from 'lodash';
 import { IDataConnection } from '../shared/DataObject';
 import { DataContract, IDataContractConstruct } from './DataContract';
 
-export abstract class DataConnection<T extends DataContract> implements IDataConnection<T> {
-
-	private _dummyContract: T = null;
-	private get dummyContract(): T {
-		if (!this._dummyContract) {
-			this._dummyContract = new (this.getContract())(null);
-		}
-		return this._dummyContract;
-	}
-
-	private _fields: string[] = [];
-	private get fields(): string[] {
-		if (!this._fields.length) {
-			this._fields = Reflect.getMetadata('ORM:fields', this.dummyContract);
-		}
-		return this._fields;
-	}
+export abstract class DataConnection<T extends DataContract> implements IDataConnection<T> {g
 
 	private get model(): Promise<sequelize.Model<any, any>> {
 		return this.getContract().getSequelizeModel();
diff --git a/shared/DataObject.ts b/shared/DataObject.ts
index a9b42c7..0e6c486 100644
--- a/shared/DataObject.ts
+++ b/shared/DataObject.ts
@@ -26,13 +26,9 @@ export const registeredClasses: registeredClassMap =
 export function register(moduleId: string, apiHidden: boolean = false) {
 	return (target: new (...args: any[]) => IDataConnection<IDataContract> | IDataContract): any => {
 		const idx = moduleId + '.' + (<any> target).name;
-		if ((<any> target).contract === true) {
-			Reflect.defineMetadata('ORM:dbId', idx, target);
-		} else {
-			registeredClasses[idx] = target;
-			Reflect.defineMetadata('ORM:registeredIndex', idx, target);
-			Reflect.defineMetadata('ORM:apiHidden', apiHidden, target);
-		}
+		registeredClasses[idx] = target;
+		Reflect.defineMetadata('ORM:registeredIndex', idx, target);
+		Reflect.defineMetadata('ORM:apiHidden', apiHidden, target);
 	};
 }