Removed unnecessary/obsolete code