Removing deprecated files
Fix
Fix