removed large chunk of 'year' code