Removed some code to remove the warnnings