Update years, remove useless condition