More cleaning up, removing unused references
Moving the ToHex into the extensions file. Will probbaly remove this, not sure its needed anymore....