Removed the unnecessary methods and some source that was comment. Worked on the issue #8.
Merge branch 'hotfix/ticket_8'