Task Manger clean-up
   * plus Javadoc