Removes some un-needed or depreciated functions