Removed unused @Service annotations from services.

Should be in 87bd97bf1385f58d982ecadcb6ef5d3c56811ec8 commit.

No functional changes.