restoring removed (unused) function calls and commenting them out instead as requested