It will be as per decision taken by the board no one can tell you about that. It may or it may not remove the optional subjects. If you are preparing from first year there is much time and no one can tell what can happen when. Try reading for other subjects if your optional is different but preparing for optional will be helpful for you only. It will not be out of syllabus.