[WIP] Clean catalog models

do not exist yet