Revert "trying to split up completeness to save memory"

This reverts commit cb47be81af14b24f05b3397b8a62bc433a4686de.