findbugs annotation removed
years updated
#master: cleanup