Removing function wrapper