[WIP] Clean catalog models

done