Revert "New code added"

This reverts commit 14c2be0932d3f6e1abbf83c7e842f05f5f0bc803.