Remove duplicate stuff

Change-Id: I71e8a81dc61487155c98de11ba2f30ec8414c931