Cleanup some code found during review

Change-Id: Ib1655f7c39fd8a117753804d2ae9504c54b8fd4f