preparation for the near or remote future ;o)
misc cleanup