Refactoring, removing dupe code, fixing tangle with renee-core
Remove application dupe code