useless refactorings

Change-Id: Ie2e321d39a73e4d430d7203865385ed719d01d7c