Remove Gap Functionality Addition