Cleanup -- includes maybe isn't required? Maybe just does joins afterward though, so includes might be more effective.