Some cleanup. Trying to get a hold around native interop mappings.