Currently my approach is removing the custom fields etc and then run deploy to recreate them^^