Removed extra wrappers