added missing wrappers
removed unused