[WIP] Clean catalog models

GroupInterface if created?