Remove superceded functions
Update Goldilocks class to populate own group data