Removed unneeded wrappers