Remove remaining group functions/strings and organise imports