Survey: Remove a few wrappers & minor cleanup