removed TODO about disp_ variables as this has been done in the disp_cleanup branch