move disposal responsibility where it belongs