Removed unused wrappers