Remove old files and try to fix subscription 'return' error.