Removed some code which is no longer used anywhere