Hello PaQ,

Upon initial investigation it looks like you just have six small areas to clean up. I doubt you'll need to recreate the model.