Removed Obsolete code