Remove old catalogue architecture