claims were not copied and fixed that issue
clean the code-removed unused code
clean the code-removed unused method
Merge pull request #59 from jenananthan/master

fixed copy app related issue and clean up the code