deleted .r files; DataContext refactoring