Cleanup stuff

Since, I am not able to test this part satisfactorily, I will remove this change.