Undoing conflicts and simplifying

Removing the sample app and undoing conflicts