Removed temporary files and made AddSamplesViewModel consistent with rest of code