diff --git a/model/fileinfo/rows.go b/model/fileinfo/rows.go
index e38b58b..8bb5cb6 100644
--- a/model/fileinfo/rows.go
+++ b/model/fileinfo/rows.go
@@ -51,21 +51,7 @@ func collect(db *sql.DB) Rows {
 	var t Rows
 	start := time.Now()
 
-	sql := `
-SELECT	FILE_NAME,
-	SUM_TIMER_WAIT,
-	SUM_TIMER_READ,
-	SUM_TIMER_WRITE,
-	SUM_NUMBER_OF_BYTES_READ,
-	SUM_NUMBER_OF_BYTES_WRITE,
-	SUM_TIMER_MISC,
-	COUNT_STAR,
-	COUNT_READ,
-	COUNT_WRITE,
-	COUNT_MISC
-FROM	file_summary_by_instance
-WHERE	SUM_TIMER_WAIT > 0
-`
+	sql := `SELECT FILE_NAME, SUM_TIMER_WAIT, SUM_TIMER_READ, SUM_TIMER_WRITE, SUM_NUMBER_OF_BYTES_READ, SUM_NUMBER_OF_BYTES_WRITE, SUM_TIMER_MISC, COUNT_STAR, COUNT_READ, COUNT_WRITE, COUNT_MISC FROM file_summary_by_instance WHERE SUM_TIMER_WAIT > 0`
 
 	rows, err := db.Query(sql)
 	if err != nil {
diff --git a/model/memoryusage/row.go b/model/memoryusage/row.go
index 27dd26c..a80ff6d 100644
--- a/model/memoryusage/row.go
+++ b/model/memoryusage/row.go
@@ -107,16 +107,7 @@ func collect(db *sql.DB) []Row {
 	var t []Row
 	var skip bool
 
-	sql := `-- memoryusage
-SELECT	EVENT_NAME                                           AS eventName,
-	CURRENT_COUNT_USED                                   AS currentCountUsed,
-	HIGH_COUNT_USED                                      AS highCountUsed,
-	CURRENT_NUMBER_OF_BYTES_USED                         AS currentBytesUsed,
-	HIGH_NUMBER_OF_BYTES_USED                            AS highBytesUsed,
-	COUNT_ALLOC + COUNT_FREE                             AS totalMemoryOps,
-	SUM_NUMBER_OF_BYTES_ALLOC + SUM_NUMBER_OF_BYTES_FREE AS totalBytesManaged
-FROM	memory_summary_global_by_event_name
-WHERE	HIGH_COUNT_USED > 0`
+	sql := `SELECT EVENT_NAME, CURRENT_COUNT_USED, HIGH_COUNT_USED, CURRENT_NUMBER_OF_BYTES_USED, HIGH_NUMBER_OF_BYTES_USED, COUNT_ALLOC + COUNT_FREE, SUM_NUMBER_OF_BYTES_ALLOC + SUM_NUMBER_OF_BYTES_FREE FROM memory_summary_global_by_event_name WHERE HIGH_COUNT_USED > 0`
 
 	log.Println("Querying db:", sql)
 	rows, err := db.Query(sql)
diff --git a/model/tablelocks/rows.go b/model/tablelocks/rows.go
index a33729f..50bc5c4 100644
--- a/model/tablelocks/rows.go
+++ b/model/tablelocks/rows.go
@@ -41,24 +41,7 @@ func totals(rows []Row) Row {
 // - filter out empty values
 // - change FILE_NAME into a more descriptive value.
 func collect(db *sql.DB, filter *filter.DatabaseFilter) []Row {
-	sql := `
-SELECT	OBJECT_SCHEMA,
-	OBJECT_NAME,
-	SUM_TIMER_WAIT,
-	SUM_TIMER_READ,
-	SUM_TIMER_WRITE,
-	SUM_TIMER_READ_WITH_SHARED_LOCKS,
-	SUM_TIMER_READ_HIGH_PRIORITY,
-	SUM_TIMER_READ_NO_INSERT,
-	SUM_TIMER_READ_NORMAL,
-	SUM_TIMER_READ_EXTERNAL,
-	SUM_TIMER_WRITE_ALLOW_WRITE,
-	SUM_TIMER_WRITE_CONCURRENT_INSERT,
-	SUM_TIMER_WRITE_LOW_PRIORITY,
-	SUM_TIMER_WRITE_NORMAL,
-	SUM_TIMER_WRITE_EXTERNAL
-FROM	table_lock_waits_summary_by_table
-WHERE	COUNT_STAR > 0`
+	sql := `SELECT OBJECT_SCHEMA, OBJECT_NAME, SUM_TIMER_WAIT, SUM_TIMER_READ, SUM_TIMER_WRITE, SUM_TIMER_READ_WITH_SHARED_LOCKS, SUM_TIMER_READ_HIGH_PRIORITY, SUM_TIMER_READ_NO_INSERT, SUM_TIMER_READ_NORMAL, SUM_TIMER_READ_EXTERNAL, SUM_TIMER_WRITE_ALLOW_WRITE, SUM_TIMER_WRITE_CONCURRENT_INSERT, SUM_TIMER_WRITE_LOW_PRIORITY, SUM_TIMER_WRITE_NORMAL, SUM_TIMER_WRITE_EXTERNAL FROM table_lock_waits_summary_by_table WHERE COUNT_STAR > 0`
 
 	args := []interface{}{}