Fix: Clean before adding foreign key