Fix some commenting and remove no longer needed method args.