#973 Remove shortcuts on destory. Update files names.