Removes some logic from current year selection screen