Removing too hackish main tableView implementation