Refactor the current code.

[agbilotia1998]

The code needs complete refactoring as some portions of code are never used.

[pradeepgangwar]

@agbilotia1998 May i work on this? It's really tough for me to understand the flow.

[agbilotia1998]

@pradeepgangwar sure go ahead +1