april22: code cleanup