Make cleanup methods non-static
Fix maintenance cli error, use getProtectedMethod instead of invokeMethod (remove invokeMethod fully)