Method cleanup