[backend] cleanup commit #3cb80b58