move remove to header