[todo] cleanup