helppatch cleanup
