Removed some dead code which is not even used anywhere!

Let me know if something is wrong.