cleanup of old Hero class