Removing Obsolete Code [in progress]