Attempting to remove warnings. Wasn't able to remove all of the warning but removed some. Not sure if this will break anything else.