Final check, remove some comment-out codes and add some comment