removed the last of the warnings