Removed Unneeded Code