base: cleanup

Change-Id: I592bb9eda02bc0ffeb93d3ea43631d80994c85fa