Remove the code which is not working for now and created another branch, once working will merge