Cleaning up some of the unwarapping code that wasnt needed