Cleanup unused built

Change-Id: I61c4b62d6daaeb67958050e46fa17ba8868f9acf