Removing unnecessary indexing of tables