Year update and cleanup