removing some extraneous code that was already commented out
added some indexes to DB fields