Remove Unneeded Code