Restructure pending methods