Temp
Revert "Temp"

This reverts commit 6cca8755d8f29a56c8c6a68e209b525bef46578b.
Code cleanup
Code cleanup
Code cleanup
Code Refactoring - Remove unnecessary methods and code
Code Refactoring
Remove the unnecessary dependency on app.data.js
Remove app.data.js
Cleanup