Removed Obsolete Code