Removed More Obsolete Code