catalog:clean reimplementation
Removing dead code