Model cleanup; preparation for pagination