Remove a bunch of stringification