diff --git a/Database/MarketData.sql b/Database/MarketData.sql
index 06097a8..6e98887 100644
--- a/Database/MarketData.sql
+++ b/Database/MarketData.sql
@@ -4,8 +4,7 @@ CREATE TABLE ZacksRank
 	date DATETIME NOT NULL,
 	zacks_rank VARCHAR(25),
 	modified DATETIME NOT NULL,
-	PRIMARY KEY (symbol, date),
-	INDEX IX_ZACKS_RANK_SYMBOL (symbol ASC)
+	PRIMARY KEY (symbol, date)
 ) 
 ;
 
@@ -25,8 +24,7 @@ CREATE TABLE InsiderTransaction
 	sec_accession_number VARCHAR(55) NOT NULL,
 	form_row_number VARCHAR(55) NOT NULL,
 	modified DATETIME,
-	PRIMARY KEY (symbol, form, sec_accession_number, form_row_number),
-	KEY (symbol)
+	PRIMARY KEY (symbol, form, sec_accession_number, form_row_number)
 ) 
 ;
 
@@ -37,9 +35,7 @@ CREATE TABLE Headlines
 	asof DATE NOT NULL,
 	headline VARCHAR(255) NOT NULL,
 	source VARCHAR(25) NOT NULL,
-	modified DATETIME NOT NULL,
-	KEY (symbol),
-	INDEX IX_HEADLINES (symbol ASC, asof ASC, headline ASC)
+	modified DATETIME NOT NULL
 ) 
 ;
 
@@ -51,8 +47,7 @@ CREATE TABLE ETFHoldings
 	holding_symbol_sc VARCHAR(15),
 	pcnt_of_assets NUMERIC(19,2),
 	company VARCHAR(255),
-	modified DATETIME,
-	INDEX ETFHOLDINGS_IDX_ETFSYMBOL (etf_symbol ASC)
+	modified DATETIME
 ) 
 ;
 
@@ -67,8 +62,7 @@ CREATE TABLE DividendHistory
 	record_date DATETIME,
 	payment_date DATETIME,
 	modified DATETIME NOT NULL,
-	PRIMARY KEY (symbol, div_ex_date),
-	KEY (symbol)
+	PRIMARY KEY (symbol, div_ex_date)
 ) 
 ;
 
@@ -79,9 +73,8 @@ CREATE TABLE CompanyProfile
 	description VARCHAR(255),
 	pricing_source VARCHAR(10),
 	can_roll_previous BOOL NOT NULL DEFAULT false,
-	PRIMARY KEY (symbol),
-	UNIQUE (symbol),
-	INDEX IDX_SYMBOL (symbol ASC)
+	freeze_pricing BOOL NOT NULL DEFAULT false,
+	PRIMARY KEY (symbol)
 ) 
 ;
 
@@ -95,8 +88,7 @@ CREATE TABLE AnalystRatings
 	type VARCHAR(20),
 	ratings_change VARCHAR(50),
 	price_target NUMERIC(19,2),
-	PRIMARY KEY (symbol, date, brokerage_firm),
-	KEY (symbol)
+	PRIMARY KEY (symbol, date, brokerage_firm)
 ) 
 ;
 
@@ -109,8 +101,7 @@ CREATE TABLE AnalystPriceTarget
 	median_target NUMERIC(19,2),
 	high_target NUMERIC(19,2),
 	low_target NUMERIC(19,2),
-	PRIMARY KEY (symbol, date),
-	KEY (symbol)
+	PRIMARY KEY (symbol, date)
 ) 
 ;
 
@@ -191,7 +182,7 @@ CREATE TABLE Valuations
 	beta90 NUMERIC(19,2),
 	beta2Y NUMERIC(19,2),
 	market_cap NUMERIC(22,2),
-	earnings_yield NUMERIC(22,2),
+	earnings_yield NUMERIC(23,2),
 	ebit NUMERIC(22,2),
 	enterprise_value NUMERIC(22,2),
 	fundamental_value NUMERIC(22,2),
@@ -212,8 +203,7 @@ CREATE TABLE Valuations
 	dividend_yield NUMERIC(22,4),
 	shares_outstanding NUMERIC(22,4),
 	operating_cashflow NUMERIC(22,4),
-	PRIMARY KEY (symbol, valuation_date),
-	INDEX IX_VALUATIONS_DATE (valuation_date ASC, symbol ASC)
+	PRIMARY KEY (symbol, valuation_date)
 ) 
 ;
 
@@ -242,8 +232,7 @@ CREATE TABLE SecurityMaster
 	industry VARCHAR(255),
 	security_type VARCHAR(15),
 	create_date DATE NOT NULL DEFAULT =now()),
-	PRIMARY KEY (symbol),
-	UNIQUE (symbol)
+	PRIMARY KEY (symbol)
 ) 
 ;
 
@@ -275,10 +264,7 @@ CREATE TABLE Prices
 	volume BIGINT,
 	adjclose NUMERIC(19,2),
 	source CHAR(1),
-	PRIMARY KEY (symbol, date),
-	INDEX IX_PRICES_SYMBOL (symbol ASC),
-	INDEX IX_PRICES_DATE (date ASC),
-	INDEX IX_PRICES_DATE_SYMBOL (date ASC, symbol ASC)
+	PRIMARY KEY (symbol, date)
 ) 
 ;
 
@@ -330,8 +316,7 @@ CREATE TABLE MStarSecurityId
 	symbol VARCHAR(15) NOT NULL,
 	security_identifier VARCHAR(25) NOT NULL,
 	modified DATETIME NOT NULL,
-	PRIMARY KEY (symbol),
-	INDEX IX_HEADLINES (symbol ASC)
+	PRIMARY KEY (symbol)
 ) 
 ;
 
@@ -350,8 +335,7 @@ CREATE TABLE Lexicon
 	word VARCHAR(55) NOT NULL,
 	sentiment VARCHAR(10) NOT NULL,
 	part_of_speech VARCHAR(15),
-	PRIMARY KEY (word, sentiment),
-	INDEX IX_Lexicon (part_of_speech ASC)
+	PRIMARY KEY (word, sentiment)
 ) 
 ;
 
@@ -386,8 +370,7 @@ CREATE TABLE IncomeStatement
 	interest_expense NUMERIC(19,2),
 	period INTEGER NOT NULL,
 	modified DATETIME,
-	PRIMARY KEY (symbol, asof, period),
-	INDEX IX_IncomeStatement_Modified ( ASC)
+	PRIMARY KEY (symbol, asof, period)
 ) 
 ;
 
@@ -437,8 +420,7 @@ CREATE TABLE Fundamentals
 	leveraged_free_cashflow NUMERIC(19,2),
 	trailing_pe NUMERIC(19,2),
 	enterprise_value NUMERIC(19,2),
-	PRIMARY KEY (symbol, asof),
-	INDEX PK_Fundamental_Symbol (symbol ASC)
+	PRIMARY KEY (symbol, asof)
 ) 
 ;
 
@@ -502,8 +484,7 @@ CREATE TABLE CurrencyConversion
 	destination_currency_name VARCHAR(255),
 	units_per_source DOUBLE NOT NULL,
 	source_per_unit DOUBLE NOT NULL,
-	PRIMARY KEY (asof, source_currency, destination_currency),
-	INDEX IX_DATE_SOURCE (source_currency ASC, destination_currency ASC, asof ASC)
+	PRIMARY KEY (asof, source_currency, destination_currency)
 ) 
 ;
 
@@ -523,8 +504,7 @@ CREATE TABLE CashflowStatement
 	free_cashflow NUMERIC(19,2),
 	period INTEGER NOT NULL,
 	modified DATETIME,
-	PRIMARY KEY (symbol, asof, period),
-	INDEX IX_CashflowStatement_Modified (modified ASC)
+	PRIMARY KEY (symbol, asof, period)
 ) 
 ;
 
@@ -538,8 +518,7 @@ CREATE TABLE Cash
 	debit NUMERIC(19,2),
 	balance NUMERIC(19,2),
 	transaction_id INTEGER NOT NULL AUTO_INCREMENT,
-	PRIMARY KEY (account, date, transaction_id),
-	INDEX IDX_DATE ( ASC)
+	PRIMARY KEY (account, date, transaction_id)
 ) 
 ;
 
@@ -566,44 +545,6 @@ CREATE TABLE BalanceSheet
 	total_liabilities NUMERIC(19,2),
 	cash_and_cash_equivalents NUMERIC(19,2),
 	modified DATETIME,
-	PRIMARY KEY (symbol, asof, period),
-	INDEX IX_BalanceSheet_Modified (modified ASC),
-	INDEX IX_BalanceSheet_Asof_Symbol_Period (asof ASC, symbol ASC, period ASC)
+	PRIMARY KEY (symbol, asof, period)
 ) 
 ;
-
-
-
-
-
-ALTER TABLE ZacksRank ADD CONSTRAINT FK_ZacksRank_SecurityMaster 
-	FOREIGN KEY (symbol) REFERENCES SecurityMaster (symbol)
-;
-
-ALTER TABLE InsiderTransaction ADD CONSTRAINT FK_InsiderTransaction_SecurityMaster 
-	FOREIGN KEY (symbol) REFERENCES SecurityMaster (symbol)
-;
-
-ALTER TABLE Headlines ADD CONSTRAINT FK_Headlines_SecurityMaster 
-	FOREIGN KEY (symbol) REFERENCES SecurityMaster (symbol)
-;
-
-ALTER TABLE ETFHoldings ADD CONSTRAINT FK_ETFHoldings_SecurityMaster 
-	FOREIGN KEY (etf_symbol) REFERENCES SecurityMaster (symbol)
-;
-
-ALTER TABLE DividendHistory ADD CONSTRAINT FK_DividendHistory_SecurityMaster 
-	FOREIGN KEY (symbol) REFERENCES SecurityMaster (symbol)
-;
-
-ALTER TABLE CompanyProfile ADD CONSTRAINT FK_CompanyProfile_SecurityMaster 
-	FOREIGN KEY (symbol) REFERENCES SecurityMaster (symbol)
-;
-
-ALTER TABLE AnalystRatings ADD CONSTRAINT FK_AnalystRatings_SecurityMaster 
-	FOREIGN KEY (symbol) REFERENCES SecurityMaster (symbol)
-;
-
-ALTER TABLE AnalystPriceTarget ADD CONSTRAINT FK_AnalystPriceTarget_SecurityMaster 
-	FOREIGN KEY (symbol) REFERENCES SecurityMaster (symbol)
-;